bitkeeper revision 1.1159.183.58 (41c00a4bcegoLJhTFK6otLjaxKbuWg)
authorkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Wed, 15 Dec 2004 09:56:27 +0000 (09:56 +0000)
committerkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Wed, 15 Dec 2004 09:56:27 +0000 (09:56 +0000)
Merge scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk


Trivial merge